until I went through his code and ripped out the one-line stuff and replaced it with something human-readable