updated with note about refactor and new todo
white space adjustment and new todo in code