Improved formatting, minor fixes