Code cleanup
Made all delegate methods optional