code cleanup and removed unwanted whitespace :)