Lab 1 and lab2 changes

Some refactors to first and second labs