Refactored, improved and cleanup business