Code cleanup + Backup folder debug