Refactor & optimize Logos and Kits classes