Code beautification 2