Addition to previous commit. Cleaning up