Code beautifications