Nice code is nice <3 (closes #81 #82)