Fixed more checkstyle and bugs