Improve citations and refactor (Law of Demeter)