Using the lab book now
Code clean up