Code prettification pt 2