eval: Little cleanup
main: Cosmetics