Cleaning up le source!