Bit more cleanup/comments