Code beautificaions