cleanup code to improve readability, remove StringBuffers for compile-time finals/constants etc.