Reworking code