Refactored accelerometer collection