Use st

And some general cleanup