Little refactoring
Merge pull request #387 from Kenny9999/development

Little refactoring