Add code style tasks
Update with latest before video
Merge with master