started code cleanup