Fixed include guard. Cleanup