Smart completion: refactored static members processing
Smart completion: refactored one big class into a set of smaller ones