Small bug fix
Small style fixes
Improve documentation