Some cleanup and test with automatic astyle