starting code cleanup
starting code cleanup