Refactored curler class and renamed some methods