Updated Readme + minor refactoring