Clean up and comment recent changes