Some cleanup on backend
Huge schema + calculation refactor