Code Cleanup+Started on Edit Mode