Mostly cleaned up beaconSense code to adhere with other code conventions in our project