whitespace fix
fixing a few line lenght warnings
renaming constants for psr-1 compliance