Minor cosmetic cleanups

Just resolving some basic style-checker issues