clean up / checkstyle & findbugs added