Cleanup code
Remove unnecessary code, reduce number of local vars
Make style consistent