Refactoring, added some LCD messages