Cleaned Up Formatting

Preparing this for better code reused.