Code re-factoring 1.1