formatting fixes, changed include guard