A few more comments / moving around of code and removal of unused pieces