Code cleanup (?)