Simplifying of bounds calculation. See #26
Indentation fix, see #26