Make everything strict

And fixed return type error