Small refactor
Small refactor

cowbell/sharedrop,shelsonjava/sharedrop,shelsonjava/sharedrop,cowbell/sharedrop,rogervaas/sharedrop,shelsonjava/sharedrop,umeshjakhar/sharedrop,rogervaas/sharedrop,umeshjakhar/sharedrop