Cleaned up code & General backup