#16 and readability cleanup