Refactoring to appease GitHub language stats