style organization and comments
clean up