added checkstyle and codestyle
Merge remote-tracking branch 'upstream/master' into AESH-245
Correcting formatting