Fix issue#20, format following the guidelines