Review

Code refactoring to completely decouple the back-end logic from the front-end display.