Optimized logic
Updated Readme