Some more commentary and readability