Some code beautifications
Documentation