Updated comments and removed boilerplate