lab1: yet another cleanup