Unifying the code. Changes after testing the app