BAA lab1-3 cleanup