Making pretty

This version of the code is going in our research paper