Clean up style. Add comments.