view update, code cleanup