#7: Finishing hyperlink mode
Code cleanup and options refactoring