clean up source code layout