basic refactoring

Make it simple