removed useless if statement
removed extra whitespace