dependency analysis + checkstyle fixes