go fmt + started splitting into smaller files
WIP change to identity