Gave some methods more appropriate names