Fixed some bugs ad checkstyle shit
Checkstyle shit added