Cleaning up
Builds with -Wall