Clean up a bit

- Add return comment
- Change len types to size_t
- Fix broken return value