Adding helper methods and comments