Refactoring, removed crap from the .pbm method and added rspec testing