Code annotations and cleanups