Some formatting tweaks
cleanup
removed pry