Refactoring a bit

Also adding stuff to readme.