code style clean up