Refactor + looks improvements