removed hardcoded price ids and some refactoring