Dev

I was doing code reviewing and refactoring some methods, i'd like to merge the changes in the development branch