Added Goto Definition.
Code cleanup from Erik's review.