Some code cleanup + add a missing `@inbounds`

[navidcy]

Most changes are aesthetic and less code.

Only adding a few @inbounds is possibly the important changes.

[tomchor]

Thanks! I wonder how much difference the @inbounds makes...