Ondemand:Cleanup and Tune-up

Signed-off-by: zeroblade1984 <zeroblade1984@gmail.com>