Updated Class & removed interface comments

Feel free to roll back if comments were needed