Applied consistend naming and updated README