cleaning up and WIP for tracking

Signed-off-by: Simarpreet Singh <s244sing@uwaterloo.ca>