Better naming functions, remove unnecesary info from json output