Cleanup

Changed lists to tulples