Simplify things
Clean up this and that
Comment