formatting and cleanup
Merge pull request #347 from grischa/facview

formatting and cleanup