first back of code cleanup