Make code *tons* cleaner. Formatting, fixes.