cleanup
code cleanup and labels