Checkstyle and one function fix