Clean-up, styled code, updated Readme