checkstyle and code convention violations fixed