Finalchanges

All changes suggested in review are done except for using aliases.