Reducing boilerplate and cleaning up