update: Cleanup and other updates

* Using touples instead of lists where applicable
* Other cleanups

Signed-off-by: mr.Shu <mr@shu.io>