Polished the code a bit
Updated README