Simplify implementation
Remove dead code
Add return type