Cleaning up code from whitespaces