code cleanup added swf