Cleaned up formatting so it's more extensible

Maybe now I will stop procrastinating!