Cleaned up move functionality