Code formatted
comments fixed
faces messages improved