Beautify/clean up source