minor formatting and cleanup

minor formatting and cleanup