Review cleanup

Removed var, etc.