Cleaning up Morse project a bit.