Significant refactoring. Less code and easier to understand.