Removed the bang in the names of several methods