Add border to demo properties
Whitespace formatting
Break out 'buildVariable' as its own function