methods moved into appropriate classes and the computer is smarter