Naming schema and comments added :hotel: