Implementing the suggestions in the issues