Made code more readable
minor space removal
Backwards compatibilty for RevanTools Added.