FIX: Close file and code style fix