428 Code cleanup