cleaning up the repo and playing around with include guards