Code is now better structured and easy to browse.