Grammer improvements
seperated out the functions