Cleaning up components a bit