Some code refactoring and added a message that is displayed after successfully loading