updates + code cleanup