Was trying to keep code close to original. :)
Can add "cosmetics" commit, if needed.