Minor changes

Removed redundant include guards and some other unneccesary stuff.