addressed some TODOs and cleaned up