Cleanup from using @extend
Code-style fixed
Merge pull request #171 from amikheychik/master

extend cleanup