cleaned some stuff up in angularland