Improve readability of JSONProperty annotation handling logic 

Cleaned up the logic. Please let me know the comments.