Add comments and style changes