Fixing unnecessary universal import.

Also improving app's modularity, and fixing small typos.