Update Rant, cleanup code