made beautiful
merge conflict resolved
made json nice