Moved where the +10 in the storage slots hapopen, so that it's clearer
Improved returns, by suggestion of IntelliJ