Add pry and some cleanup.