cleaned out commented code, cleaned up string manip tests