Reasonable var names
Remove string duplication
Allow for better optimization
New build