Sort var declaration
Update comments
Merge branch 'cleanup'