Bug 1066330 - [User Story] Improve FTE UX
cleanup and comments