Adjust some phpDoc comments and code formattings