Improved Main Files

Better Formatting mostly, nothing major.