remove unecessary functions, fix wording