cleaned up useless code, commented Parse functions