Replacing quit+print with exit

Just to test out pull-requests, bigger edit if I get time.