[Feature] Adding links, pretty-printing annotation, making code less monolithic