clean up source code for better presentation