Minor improvements

squash several imports
refactor data mixin
refactor JSON responses