Unnecessary else block; please fix and I'll integrate (-: