Code cleanup for manual written maintenance