removed exception
removed some System.out.println calls and did some tiny cleanup