Changed some variable and methods names and update the Readme