Removed unused catch.hpp and applied astyle formatting.