Add comments, formatting