Better looking code