Tidied up the cod a little bit.

Removed the Espresso project file too :)