Code beautification 3