modified style, updates
removed some unused files