Removing some testing output lines

Also tidied up empty lines etc