Removed block comments
Changed to using classes