added annotations to parser and renderer, deleted unused class