slight tweaks to comments/style