add @since annotation
tiny code cleanups