[FIX] Formatting, Cleaned up a bit