Use extensions where applicable #5