refactored recommendations + removed some unused code