Cleans up code

Also adds info about Arch