Refactoring, added speedread