code cleanup
video support added