Merge pull request #1207 from runrevali/refactor

[[ Array Props ]] Remove requirement for array props to be specified as ...
[[ Memory Leaks ]] Prevent some potential memory leaks