Final fixes

checkstyle and some fixes have added