Added comments and changed modifiers