amd64: Refactoring