Be consistent with error messages and code formatting. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>