Minor changes

use syntax sugar as much as possible, I couldn't use it for Array<CollectionType>.Type though...