Implemented sort, cleaned intents and item class