refactored methods to have block at end