Cleanup & rename of reflect method
Merge remote-tracking branch 'JSONMarshal/master'