Code cleanup & save code tweaks