Rename some variables
Remove unnecessary variables
Add missing letters in comments / strings
Add comments