Small refactor & Organized Import