Some code cleanup
Removed and added Println's