#15, #16 Last task is done and some cleanup