Cleaning up the source code