Such refactoring, very clean
further refactoring and api explorer home