fixed clip, removed old comments, just generally made pretty