Variables names cleaned up