Cleaning source up a bit - addresses #2