Refactor rebar properties input