Fix #230
Fix #232
Fix #230
Fix #223
Fix #214
Fix #237
Code convention