Moved simplification to better layout section