Optimized if some if-else statements
More updates
Removed pre fields and fixed incorrect amendment in readme
Merge pull request #35 from atomicpages/master

Minor Optimizations