added constants
removed whitespace