minor refactoring, starting to implement noise sensor