moved some parsing code around, reduced presenter code