Code refactor, added Query class which meant seperating the keyword functionality of page into it's own class