code cleanup
minor code cleanup