Format + add some comments
Fix - some small setup problem