basic responsive updates, code cleanup