Fixed config files & checkstyle