QoL fixes. Removed unnecessary return types and localized access.