Code Style and Layout Fixes
Merge pull request #470 from sreeram-boyapati/decrypt

Code style fixes, removed unused code and Layout code simplified