Reworking of code