readability cleanup, extract method