Code cleanup?