Removed unneeded test statements
Fixed formatting and added more verbose print