Removed Redundnacy
Fixed moving bug