Further improvement & further simplification