Improve app structure. Fix trailing spaces