some cleanup and code style