Finishing touches to code + comments