Cleanedup formatting, just neds comments now.