Extracted fragment for wishes and refactored code.
Ran lint and solved some errors and warnings