Cleanup variables to fit coding style