Fix all Rubocop complains
Add typography tests
improve type
merge types