Code cleanup & fix