Fixing formatting, not finished