minor code cleanup
code formatting and cleanup