Add identifier position information
Rewrite some code after hlint pass