Cleaned up backend, made some namings and approaches more consistent