Refactor: Spacing. Remove self