Cleanup variable names and such
Add missing uORB topic