Fixing code styles