After eggrobin's review.
Remove code duplication.
Weird artifact.
?
Lint