Refactoring in process
Implementing criteria - 1-9 done