refactored stuff and updated readme