Added some feedback, changed some formatting