Miscellaneous simplification