PR #2: Code looks a little better now