Apply code design suggestions