Removed some unnecessary methods, added exceptions, ran codepro tools