applied hlint suggestions
corrected extensability problem