Cleanup Compiles a bit