Added enter key+ cleaner code