@SLaks, now that its merged, should we fix these redundancies and the unnecessary if block you pointed out below?