Cleaning up variable definitions