Making the src less embarrassing every commit