Removing menu
Cleaning up some TODO items
Extracting parameters