Cleaning up the codebase (now in the right branch...)