#7 Better documentation