Fixed code complexity