Cleaning things up and trying to simplify things by using the parser {} computation expression as much as possible.