Added JSON conversion using Jackson
Cleaned up code and comments
Minor fixes