Indent fixes
Simplifying expressions
Fixes issue #325
fix for issues #321 and 258
Merge pull request #312 from WebSpider/dev-code_cleanup

Code cleanup
Fixes issues #333 and problems with converting str to int via prettyName func