Initial code cleaning by swapnil
initial cleaning done by swapnil
Merge branch 'master' of https://github.com/TaviscaSolutions/red-repo
 basic code cleaning done by swapnil