Added InVertex and OutVertex annotations and did some minor cleanup.