Clean up boilerplate to simplify