Yes, this looks better. Btw do you think a class that contains the block and its annotation is better?