Get pedantic
Add missing returns (I do plan to handle return codes at some point)
clean up unused parameters etc