Revert "CE-26 Small style changes"
removing changes that didn't help

This reverts commit 3fca8cba2d8c0e757abd17a9c38e60432e885db0.
Revert "CE-26 Using new snnipet mechanism"
removing changes that didn't help

This reverts commit ea8867b042ca588401c26810938fc5e217568a24.