Refactoring + noises fixed + int to double