Clean up source code some more