4th commit; LAB 2 dip compliant; fixing other best practice errors