Finish code cleanup