Cleaning up the code and imporving displaying