Refactoring and simplify klub project