Clean app (35/42)

Clean app