Update parser to parse Short Stories, move some methods, remove unnecessary @Override