Apply checkstyle and sample changes