fix: Use proper return types

fix: Use proper return types #914