Code cleanup & standard