Sprint4 part3

please refer to our coding conventions
unless this is a 3rd party - in this case please mark somehow files like that so we won't review them