Code clean-up, inclusion of executable