cleaned up jatapp