Minor style changes.
Resolved TODOs related to data listeners and removed an unnecessary condition.
Updated TODOs.
Fixed style of TODOs.
Minor style changes to TestMETA.
Cleaned up Handshake.