Refactored general stuffs

Changed README