Executable: clean-up a bit