Clean codeing ...