Refactoring code base

Changed some comments, removed print lines, cleaned up code