Style, readability and cleanups