Code cleanup + New messages when selling