Cleanup of code style in Repository