Style fixes, include guard