Fix for convenience property init ordering issue
White space tidy
Merge of PR #24

As Rahim pointed out this looks a bit messy due to whitespace cleanup.
Fixes pop initialization.