Alright, I've done my best to edit my CS.
Can I interest you, Sep, in another look? :)