Code beautification 4