Refactored: moved from company