Cleaned up trailing whitespaces etc.