Merge pull request #26 from axsh/remove-unnecessary-code

Remove unnecessary code
extract prepare().