consolidated changes

Consolidated changes into one commit 
[minor] tabs / spaces mismatch