Updated readme, cleaned some code