removed assets & restructured code