Cleanup: Fix styling issues so Travis build passes