Resolved TODOs.
Fixed formatting.