Beautification

Merging into master