Cleaned up System.out code