Fully fixed checkstyle errors and other stuff