Minor style improvements and comments
Added