Optimized code
Updated readme