Style update
removed unused stuff