Refactoring, peanut support and added screenshot