Cleaned up codestyle