Simplifying some stuff