Clear blank lines, optimize code in base class
Moved clientable module to client class