Documentation
Code beautifications