Made changes so the class was more in line with the spirit of ruby