Prepare for further refactor/cleanup; add some todos,
fix some formatting issues