Annotated code more thoroughly