Refactored fic client app