code cleanup and restructuring; add wind speed in bft; add small test