continue code cleanup and refactor