cosmetic fixes

+ Cleanup code (converted whitespaces to tabs)