Polish and combined assignment 2 to prepare for submission