Removed unused variable and unify some names.