[MEMBER][Wen Hao] - a little refactoring, add more checkstyle rules.