code refactoring step one (not working!)