Commented better, trimmed stuff.