code cleanup
built changes