Cleanup
Shorter variable names