Linting checking
Cleaning in tasks
Start adapt Class for Storm
Typo fixes