Some cleanup, comments and whitespaces