Fixed Checkstyle and FindBugs issues