Fixed checkstyle issues, [fixed #27]