CHG: Code styling improved, no more sad smileys :)