small and simple cleanups
add note to TODO