Just code re-factoring!