Small code style and comment improvements

Small code style improvements; (hopefully) clarified some comments