Fixing formatting and naming