Tidied up, removed object code