Less CS-ish nonsense