Renamed some methods and readme improved