Renamed and added comments.