Cleaning up the source!