Added comments and setup methods