starting some code cleanup