Add some notes to CONTRIBUTING.md
Small CS fixes
Try to simplify some methods