Improved settings, shorter variable names