Update to 0.4.15 MAJOR REFACTORING AND CLEANING part 2