- Fixed some style issues
- Removed several "System.out.print" calls that were leftovers from
quick debugging