Refactoring, minor fixed, made binds return a reference (useful for rebinding)