misc cleaning & code style guide updates