Fixed stuff + checkstyle